From: Keir Fraser <keir@xen.org>
Date: Fri, 20 Jan 2012 18:17:59 +0000 (+0000)
Subject: x86/hvm: Fix earlier hvm_load_cpu_ctxt() breakage.
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https://%22%22/%22http:/www.example.com/cgi/%22https:/%22%22?a=commitdiff_plain;h=e510f6c58dee33f8a559637fe07108146b44e8e7;p=xen.git

x86/hvm: Fix earlier hvm_load_cpu_ctxt() breakage.

Signed-off-by: Keir Fraser <keir@xen.org>
---

diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c
index 554afa3ac9..b3d9ac0791 100644
--- a/xen/arch/x86/hvm/hvm.c
+++ b/xen/arch/x86/hvm/hvm.c
@@ -686,7 +686,7 @@ static int hvm_load_cpu_ctxt(struct domain *d, hvm_domain_context_t *h)
 
     /* Need to init this vcpu before loading its contents */
     rc = boot_vcpu(d, vcpuid, NULL);
-    if ( rc != 0 )
+    if ( (rc != 0) && (rc != -EEXIST) )
         return rc;
 
     if ( hvm_load_entry(CPU, h, &ctxt) != 0 )